From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Jan 2015 20:57:51 +0000 (+0100)
Subject: merge master
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3388
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d464b0ee300a1919f4398195974396e3e3d66d57;p=emacs.git

merge master
---

d464b0ee300a1919f4398195974396e3e3d66d57